window: Propagate accel changes
authorMatthias Clasen <mclasen@redhat.com>
Thu, 17 Jun 2021 12:32:11 +0000 (08:32 -0400)
committerMatthias Clasen <mclasen@redhat.com>
Thu, 17 Jun 2021 12:50:26 +0000 (08:50 -0400)
When the global accels change, tell the
shortcut controller to re-inject them into
the action muxer hierarchy.

gtk/gtkwindow.c

index a79e1605820f5d4909d95a8eb82584886dc2ef81..df3d3d7e87a6666f58b07f7801171787d7fc45c7 100644 (file)
@@ -54,7 +54,7 @@
 #include "gtknativeprivate.h"
 #include "gtksettings.h"
 #include "gtkshortcut.h"
-#include "gtkshortcutcontroller.h"
+#include "gtkshortcutcontrollerprivate.h"
 #include "gtkshortcutmanager.h"
 #include "gtkshortcuttrigger.h"
 #include "gtksnapshot.h"
@@ -2376,6 +2376,8 @@ handle_keys_changed (gpointer data)
       priv->keys_changed_handler = 0;
     }
 
+  if (priv->application_shortcut_controller)
+    gtk_shortcut_controller_update_accels (GTK_SHORTCUT_CONTROLLER (priv->application_shortcut_controller));
   g_signal_emit (window, window_signals[KEYS_CHANGED], 0);
   
   return FALSE;